Snap for 11767079 from e2218d7b06f8d1ca0972fdb07e0c375b0e9a62e3 to 24D1-release Change-Id: Idd132139b87a0add7a4f79fbd7665e501934e979